From: Florian Müllner <fmuellner@gnome.org>
Date: Thu, 25 May 2017 01:22:11 +0000 (+0200)
Subject: build: Always install xdg-desktop-portal metadata
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~321
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=60c00f04721bd1b9a079198b06759ab75ccaa38e;p=gnome-shell.git

build: Always install xdg-desktop-portal metadata

The build target accidentally ended up in a network manager conditional,
though the portal doesn't depend on NM in any way.

https://bugzilla.gnome.org/show_bug.cgi?id=783206
---

diff --git a/data/Makefile.am b/data/Makefile.am
index c27054eba..671ea7eca 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,15 +1,15 @@
 CLEANFILES =
 NULL =
 
+portaldir = $(datadir)/xdg-desktop-portal/portals
+portal_DATA = gnome-shell.portal
+
 desktopdir=$(datadir)/applications
 desktop_DATA = org.gnome.Shell.desktop gnome-shell-extension-prefs.desktop
 
 if HAVE_NETWORKMANAGER
 desktop_DATA += org.gnome.Shell.PortalHelper.desktop
 
-portaldir = $(datadir)/xdg-desktop-portal/portals
-portal_DATA = gnome-shell.portal
-
 servicedir = $(datadir)/dbus-1/services
 service_DATA = org.gnome.Shell.PortalHelper.service